Skip to content

Refactored retry config into _retry.py and added support for exponential backoff and Retry-After header #871

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 21, 2025

Conversation

jonathanedey
Copy link
Contributor

@jonathanedey jonathanedey commented Apr 14, 2025

Adds more retry logic support

This PR covers:

  • Moving and refactoring HttpxRetryTransport to _retry.py
  • Adding new class HttpxRetry to manage retry state
  • Adding support for setting some retry configurations on HttpxRetryTransport creation
  • Performing exponential backoff before request retries
  • Respecting Retry-After headers from request responses
  • Unit tests for HttpxRetry and HttpxRetryTransport
  • Unit test for handing HTTPX request errors

@jonathanedey jonathanedey added the release:stage Stage a release candidate label Apr 14, 2025
Copy link
Member

@lahirumaramba lahirumaramba left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks Jonathan! Overall looking good! Added a few comments!


def __init__(
self,
status: int = 10,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it make sense to call this max_retries instead?

Copy link
Contributor Author

@jonathanedey jonathanedey May 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the current state yes because status retries are our only retries we have. This was more of a future proof decision for when we added error retires where we would have total, status and error counters.

Similar to the placeholder comment I think we can use max_retries (and retries_left internally since we decrease this value) and add the other options later.

response, error = None, None

try:
logger.debug('Sending request in _dispatch_with_retry(): %r', request)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we plan to keep these logs in the production code?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would want to keep these for future debugging. This would be helpful to catch issues as we iterate. Wdyt?

Copy link
Member

@lahirumaramba lahirumaramba left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Thank you!

@jonathanedey jonathanedey merged commit acf955a into fcm-http2 May 21, 2025
13 checks passed
jonathanedey added a commit that referenced this pull request Jun 3, 2025
…or FCM async and HTTP/2 support (#882)

* Added minimal support for sending FCM messages in async using HTTP/2 (#870)

* httpx async_send_each prototype

* Clean up code and lint

* fix: Add extra dependancy for http2

* fix: reset message batch limit to 500

* fix: Add new import to `setup.py`

* Refactored retry config into `_retry.py` and added support for exponential backoff and `Retry-After` header (#871)

* Refactored retry config to `_retry.py` and added support for backoff and Retry-After

* Added unit tests for `_retry.py`

* Updated unit tests for HTTPX request errors

* Address review comments

* Added `HttpxAsyncClient` wrapper for `httpx.AsyncClient` and support for `send_each_for_multicast_async()` (#878)

* Refactored retry config to `_retry.py` and added support for backoff and Retry-After

* Added unit tests for `_retry.py`

* Updated unit tests for HTTPX request errors

* Add HttpxAsyncClient to wrap httpx.AsyncClient

* Added forced refresh to google auth credential flow and fixed lint

* Added unit tests for `GoogleAuthCredentialFlow` and `HttpxAsyncClient`

* Removed duplicate export

* Added support for `send_each_for_multicast_async()` and updated doc string and type hints

* Remove duplicate auth class

* Cover auth request error case when `requests` request fails in HTTPX auth flow

* Update test for `send_each_for_multicast_async()`

* Address review comments

* fix lint and some types

* Address review comments and removed unused code

* Update metric header test logic for `TestHttpxAsyncClient`

* Add `send_each_for_multicast_async` to `__all__`

* Apply suggestions from TW review
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release:stage Stage a release candidate
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants